bitkeeper revision 1.1159.1.203 (41627baf9iewVs_cM71QK_H2uLYnYw)

wait longer for domain to suspend.

diff --git a/tools/libxc/xc_linux_save.c b/tools/libxc/xc_linux_save.c
index 81e5ba5b572be5bc9dbbea6cfed346a0d5b22e20..df6a77ed94ba2829b6a5a3cfe2065c1988da29c6 100644 (file)
--- a/tools/libxc/xc_linux_save.c
+++ b/tools/libxc/xc_linux_save.c
@@ -269,8 +269,10 @@ retry:
     }
 
 
-    if( ++i < 3 )
+    if( ++i < 100 )
     {
+       xcio_error(ioctxt, "Retry suspend domain (%lx)",
+                  op->u.getdomaininfo.flags);
        usleep(10000);  // 10ms 
        goto retry;
     }

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index c40576e3cda04c0efa7e08fc6fb0ffc2bc047b0f..e0fe960549bc11b373b5283fbb88a2f8efe3762b 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -70,10 +70,10 @@ void do_task_queues(unsigned char key, void *dev_id,
 
     for_each_domain ( d )
     {
-        printk("Xen: DOM %u, CPU %d [has=%c] refcnt=%d nr_pages=%d "
+        printk("Xen: DOM %u, CPU %d [has=%c] flags=%lx refcnt=%d nr_pages=%d "
                "xenheap_pages=%d\n",
                d->domain, d->processor, 
-               test_bit(DF_RUNNING, &d->flags) ? 'T':'F',
+               test_bit(DF_RUNNING, &d->flags) ? 'T':'F', d->flags,
                atomic_read(&d->refcnt), d->tot_pages, d->xenheap_pages);
 
         if ( d->tot_pages < 10 )